From 4636fa7efe134441db9b48a5ba029a99cb82fcf8 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 22 May 2006 17:02:54 +0000 Subject: [PATCH] Don't mask "time" with the "time" argument. 2006-05-22 Emmanuele Bassi * gtk/gtkrecentmanager.h: * gtk/gtkrecentmanager.c (gtk_recent_info_get_application_info): Don't mask "time" with the "time" argument. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ gtk/gtkrecentmanager.c | 6 +++--- gtk/gtkrecentmanager.h | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 328651028e..560206d438 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-05-22 Emmanuele Bassi + + * gtk/gtkrecentmanager.h: + * gtk/gtkrecentmanager.c + (gtk_recent_info_get_application_info): Don't mask "time" with + the "time" argument. + 2006-05-22 Matthias Clasen * gdk/gdkcolor.h: gdk_color_parse returns boolean, not int. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 328651028e..560206d438 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2006-05-22 Emmanuele Bassi + + * gtk/gtkrecentmanager.h: + * gtk/gtkrecentmanager.c + (gtk_recent_info_get_application_info): Don't mask "time" with + the "time" argument. + 2006-05-22 Matthias Clasen * gdk/gdkcolor.h: gdk_color_parse returns boolean, not int. diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c index 67e0617a8c..e047f29bc2 100644 --- a/gtk/gtkrecentmanager.c +++ b/gtk/gtkrecentmanager.c @@ -1743,7 +1743,7 @@ recent_app_info_free (RecentAppInfo *app_info) * @app_name: the name of the application that has registered this item * @app_exec: return location for the string containing the command line * @count: return location for the number of times this item was registered - * @time: return location for the timestamp this item was last registered + * @time_: return location for the timestamp this item was last registered * for this application * * Gets the data regarding the application that has registered the resource @@ -1763,7 +1763,7 @@ gtk_recent_info_get_application_info (GtkRecentInfo *info, const gchar *app_name, gchar **app_exec, guint *count, - time_t *time) + time_t *time_) { RecentAppInfo *ai; @@ -1788,7 +1788,7 @@ gtk_recent_info_get_application_info (GtkRecentInfo *info, *count = ai->count; if (time) - *time = ai->stamp; + *time_ = ai->stamp; return TRUE; } diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h index c09deb2865..1d21870c3d 100644 --- a/gtk/gtkrecentmanager.h +++ b/gtk/gtkrecentmanager.h @@ -182,7 +182,7 @@ gboolean gtk_recent_info_get_application_info (GtkRecentInfo *info const gchar *app_name, gchar **app_exec, guint *count, - time_t *time); + time_t *time_); gchar ** gtk_recent_info_get_applications (GtkRecentInfo *info, gsize *length) G_GNUC_MALLOC; gchar * gtk_recent_info_last_application (GtkRecentInfo *info) G_GNUC_MALLOC; -- 2.30.2